diff --git a/system/libraries/Input.php b/system/libraries/Input.php
index 1874b37..5832d2d 100644
--- a/system/libraries/Input.php
+++ b/system/libraries/Input.php
@@ -556,14 +556,11 @@
 		 *
 		 * <a href="http://%77%77%77%2E%67%6F%6F%67%6C%65%2E%63%6F%6D">Google</a>
 		 *
-		 * Note: Normally urldecode() would be easier but it removes plus signs
+		 * Note: Use rawurldecode() so it does not remove plus signs
 		 *
 		 */	
-		$str = preg_replace("/(%20)+/", '9u3iovBnRThju941s89rKozm', $str);
-		$str = preg_replace("/%u0([a-z0-9]{3})/i", "&#x\\1;", $str);
-		$str = preg_replace("/%([a-z0-9]{2})/i", "&#x\\1;", $str); 
-		$str = str_replace('9u3iovBnRThju941s89rKozm', "%20", $str);	
-				
+		$str = rawurldecode($str);
+		
 		/*
 		 * Convert character entities to ASCII 
 		 *
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 83e9046..63e4531 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -58,6 +58,14 @@
 <h1>Change Log</h1>
 
 
+<h2>Version 1.6.1</h2>
+<p>Release Date: -- still in development</p>
+
+<ul>
+	<li>Modified xss_clean() to be more intelligent with its handling of URL encoded strings.</li>
+</ul>
+
+
 <h2>Version 1.6.0</h2>
 <p>Release Date: January 30, 2008 </p>
 <ul>